merge.bash

prompt_choose_function "# [bent merge] ${cOff}- Merge current branch into another branch" "${help_mode} merge" "merge" "Merge current branch into another branch" "${help_mode} merge conflicts" "conflicts" "See files with merge conflicts"